Don't move back one char when we are actually at the end of the paragraph.

Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end):
	Don't move back one char when we are actually at the end of the
	paragraph.

CV: ----------------------------------------------------------------------

diff --git a/ChangeLog b/ChangeLog
index a5427d52f5327046e3d603bf87610d752a733070..4040a6fbcfab33dbfdd8557f4e41ad15cdfce0d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): 
+       Don't move back one char when we are actually at the end of the 
+       paragraph.
+
 2000-11-15  Robert Brady  <robert@suse.co.uk>
 
        * modules/input/iminuktitut.c (inuktitut_compose_seqs): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a5427d52f5327046e3d603bf87610d752a733070..4040a6fbcfab33dbfdd8557f4e41ad15cdfce0d8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): 
+       Don't move back one char when we are actually at the end of the 
+       paragraph.
+
 2000-11-15  Robert Brady  <robert@suse.co.uk>
 
        * modules/input/iminuktitut.c (inuktitut_compose_seqs): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a5427d52f5327046e3d603bf87610d752a733070..4040a6fbcfab33dbfdd8557f4e41ad15cdfce0d8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): 
+       Don't move back one char when we are actually at the end of the 
+       paragraph.
+
 2000-11-15  Robert Brady  <robert@suse.co.uk>
 
        * modules/input/iminuktitut.c (inuktitut_compose_seqs): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a5427d52f5327046e3d603bf87610d752a733070..4040a6fbcfab33dbfdd8557f4e41ad15cdfce0d8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): 
+       Don't move back one char when we are actually at the end of the 
+       paragraph.
+
 2000-11-15  Robert Brady  <robert@suse.co.uk>
 
        * modules/input/iminuktitut.c (inuktitut_compose_seqs): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a5427d52f5327046e3d603bf87610d752a733070..4040a6fbcfab33dbfdd8557f4e41ad15cdfce0d8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): 
+       Don't move back one char when we are actually at the end of the 
+       paragraph.
+
 2000-11-15  Robert Brady  <robert@suse.co.uk>
 
        * modules/input/iminuktitut.c (inuktitut_compose_seqs): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a5427d52f5327046e3d603bf87610d752a733070..4040a6fbcfab33dbfdd8557f4e41ad15cdfce0d8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): 
+       Don't move back one char when we are actually at the end of the 
+       paragraph.
+
 2000-11-15  Robert Brady  <robert@suse.co.uk>
 
        * modules/input/iminuktitut.c (inuktitut_compose_seqs): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a5427d52f5327046e3d603bf87610d752a733070..4040a6fbcfab33dbfdd8557f4e41ad15cdfce0d8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Nov 15 20:16:54 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): 
+       Don't move back one char when we are actually at the end of the 
+       paragraph.
+
 2000-11-15  Robert Brady  <robert@suse.co.uk>
 
        * modules/input/iminuktitut.c (inuktitut_compose_seqs): 

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 68e2d0abbd50c52081bfbde0f82250d136516299..5d5b8e8ee77ac3aa7b7f3dd45ecc29de7beac00c 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -2501,11 +2501,11 @@ gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
                                      direction < 0 ? byte_offset : byte_offset + layout_line->length,
                                      0);
 
-          /* FIXME: As a bad hack, we move back one position to avoid going
-          * to next line on a forced break not at whitespace. Real fix
-          * is to keep track of whether marks are at leading or trailing edge?
-           */
-          if (direction > 0 && layout_line->length > 0)
+          /* FIXME: As a bad hack, we move back one position when we
+          * are inside a paragraph to avoid going to next line on a
+          * forced break not at whitespace. Real fix is to keep track
+          * of whether marks are at leading or trailing edge?  */
+          if (direction > 0 && layout_line->length > 0 && !gtk_text_iter_ends_line (iter))
             gtk_text_iter_prev_char (iter);
 
           break;